Skip to content

fix up vm parameters - #676

Merged
zhouhao3 merged 2 commits into
opencontainers:masterfrom
tych0:fix-up-vm-params
Jan 9, 2019
Merged

zhouhao3 merged 2 commits into
opencontainers:masterfrom
tych0:fix-up-vm-params

Conversation

@tych0

@tych0 tych0 commented Dec 14, 2018

Copy link
Copy Markdown
Member

with opencontainers/runtime-spec@fc51617

the runtime tools need to change as well to update the type. Do the
simplest thing and simply allow multiple instances of the same argument to
populate the array.

Signed-off-by: Tycho Andersen tycho@tycho.ws

with opencontainers/runtime-spec@fc51617

the runtime tools need to change as well to update the type. Do the
simplest thing and simply allow multiple instances of the same argument to
populate the array.

Signed-off-by: Tycho Andersen <tycho@tycho.ws>
@runcom

runcom commented Dec 19, 2018

Copy link
Copy Markdown
Member

LGTM, @vbatts please merge

@vbatts vbatts left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@vbatts

vbatts commented Dec 19, 2018

Copy link
Copy Markdown
Member

I kicked off the tests again

@tych0

tych0 commented Jan 3, 2019

Copy link
Copy Markdown
Member Author

Hrm, still seems busted? At least some of the errors look unrelated.

@vbatts

vbatts commented Jan 3, 2019

Copy link
Copy Markdown
Member

hm.

There are a few tests that have this version hardcoded and fail if it
doesn't exist in various external places like,

--- FAIL: TestJSONSchema (2.41s)
    --- FAIL: TestJSONSchema/1_error_occurred:__*_Version_string_empty_Refer_to:_https://github.com/opencontainers/runtime-spec/blob/v1.0.1/config.md#specification-version (0.00s)
	Error Trace:	validate_test.go:267
	Error:      	Not equal:
	            	expected: "1 error occurred:\n\n* Version string empty\nRefer to: https://github.com/opencontainers/runtime-spec/blob/v1.0.1/config.md#specification-version"
	            	actual: "1 error occurred:\n\n* Version string empty\nRefer to: https://github.com/opencontainers/runtime-spec/blob/v1.0.1-dev/config.md#specification-version"

-- FAIL: TestGenerateValid (0.16s)
	generate_test.go:79: unexpected MUST error(s): 1 error occurred:

		* Could not read schema from HTTP, response status is 404 Not Found

because it seems to be looking for:

https://raw.githubusercontent.com/opencontainers/runtime-spec/v1.0.1-dev/schema/config-schema.json

These probably shouldn't be hard coded, but I'll let someone from the
project figure out how to solve it :)

Signed-off-by: Tycho Andersen <tycho@tycho.ws>
@tych0

tych0 commented Jan 8, 2019

Copy link
Copy Markdown
Member Author

Ok, I figured this out, basically it's some version hard coding in the tests. It looks like there's not really a way for me to fix this, besides pretending it's not a -dev version that I imported.

@vbatts

vbatts commented Jan 8, 2019 •

Copy link
Copy Markdown
Member

i see that [gross] hard coded bit. :-
regardless,
LGTM

Approved with PullApprove

@zhouhao3
zhouhao3 merged commit 830bce2 into opencontainers:master Jan 9, 2019
@tych0 tych0 mentioned this pull request Jan 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants